Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a table to the flow description showing benefits and strengths of flow #5732

Merged
merged 13 commits into from
Nov 16, 2023

Conversation

clayton-cornell
Copy link
Contributor

@clayton-cornell clayton-cornell commented Nov 7, 2023

PR Description

This PR adds 3 tables to the Static/Flow decision topic. This is groundwork information for future flow topic refinement.

Some minor tidy and cleanup is included in this PR. This stats the alignment between the various entry topics. Longer term plan here is to reduce duplication and simplify the message (future PRs to focus on the cleanup and merging of information).

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

@clayton-cornell clayton-cornell changed the title First draft adding config table Add a table to the flow description showing benefits and strengths of flow Nov 8, 2023
@clayton-cornell clayton-cornell added type/docs Docs Squad label across all Grafana Labs repos backport release-v0.37 labels Nov 8, 2023
@clayton-cornell clayton-cornell marked this pull request as ready for review November 8, 2023 19:47
@clayton-cornell clayton-cornell requested a review from a team November 8, 2023 19:47
docs/sources/about.md Outdated Show resolved Hide resolved
docs/sources/about.md Outdated Show resolved Hide resolved
docs/sources/about.md Show resolved Hide resolved
Comment on lines 103 to 121
#### Core telemetry

| | Prometheus Agent mode | Grafana Agent Static mode | Grafana Agent Operator | OpenTelemetry Collector | Grafana Agent Flow mode |
|--------------|-----------------------|---------------------------|------------------------|-------------------------|--------------------------|
| **Metrics** | Prometheus | Prometheus | Prometheus | OTel | [Prometheus][], [OTel][] |
| **Logs** | No | Loki | Loki | OTel | [Loki][], [OTel][] |
| **Traces** | No | OTel | OTel | OTel | [OTel][] |
| **Profiles** | No | No | No | No | Pyroscope |

* **Full OpenTelemetry support**: Support for collecting OpenTelemetry
metrics, logs, and traces.
#### **OSS features**

* **PrometheusRule support**: Support for the PrometheusRule resource from
the Prometheus Operator project for configuring Grafana Mimir.
| | Prometheus Agent mode | Grafana Agent Static mode | Grafana Agent Operator | OpenTelemetry Collector | Grafana Agent Flow mode |
|--------------------------|-----------------------|---------------------------|------------------------|-------------------------|-------------------------|
| **Kubernetes native** | No | No | Yes | Yes | Yes |
| **Clustering** | No | No | No | No | No |
| **Prometheus rules** | No | No | No | No | Yes |
| **Native Vault support** | No | No | No | No | Yes |

* **Ecosystem transformation**: You need to be able to convert Prometheus and
Loki pipelines to and from OpenTelmetry Collector pipelines.
#### Grafana Cloud solutions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels strange to me for these to be subheaders of Flow mode, since it also describes the features of all other nodes. Should there be a dedicated h2 section for these?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the tables up to the top of the document and added a simple lead-in

Comment on lines 105 to 110
| | Prometheus Agent mode | Grafana Agent Static mode | Grafana Agent Operator | OpenTelemetry Collector | Grafana Agent Flow mode |
|--------------|-----------------------|---------------------------|------------------------|-------------------------|--------------------------|
| **Metrics** | Prometheus | Prometheus | Prometheus | OTel | [Prometheus][], [OTel][] |
| **Logs** | No | Loki | Loki | OTel | [Loki][], [OTel][] |
| **Traces** | No | OTel | OTel | OTel | [OTel][] |
| **Profiles** | No | No | No | No | Pyroscope |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make Flow the first column in these tables? It seems to me more eye traffic will be on the left and also in case of narrow browser windows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thampiotr I switched the order of the columns going with Flow, Static, Operator, OTel, Prometheus.

@clayton-cornell clayton-cornell merged commit 7e33d9c into main Nov 16, 2023
10 checks passed
@clayton-cornell clayton-cornell deleted the docs/add-telemetry-configuration-table branch November 16, 2023 17:13
grafanabot pushed a commit that referenced this pull request Nov 16, 2023
… flow (#5732)

* First draft adding config table

* Rephrase soem parts and move tables

* Update docs/sources/about.md

Co-authored-by: Jack Baldry <[email protected]>

* Cleanup some semantic linebreaks

* Reorg tabels, add note to operator

* Fix broken link

---------

Co-authored-by: Jack Baldry <[email protected]>
(cherry picked from commit 7e33d9c)
clayton-cornell added a commit that referenced this pull request Nov 16, 2023
… flow (#5732) (#5792)

* First draft adding config table

* Rephrase soem parts and move tables

* Update docs/sources/about.md

Co-authored-by: Jack Baldry <[email protected]>

* Cleanup some semantic linebreaks

* Reorg tabels, add note to operator

* Fix broken link

---------

Co-authored-by: Jack Baldry <[email protected]>
(cherry picked from commit 7e33d9c)

Co-authored-by: Clayton Cornell <[email protected]>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport release-v0.37 frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants